From 68c61c07d6b095680b646236a7983082a78f445a Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sat, 22 Jul 2017 11:20:41 -0500 Subject: [PATCH] Completely remove gconf support Build --without-gconf for the emacs25 flavor (as we already do for lucid and nox), since GConf has been deprecated for years. Thanks to intrigeri for reporting the issue. Closes: 869085 --- debian/control | 2 +- debian/control.in | 2 +- debian/rules | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index 94423225742..a7ab7c4ca5f 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, lib autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42), debhelper (>= 9), libxaw7-dev, sharutils, imagemagick, libgtk-3-dev, libgnutls28-dev, libxml2-dev, libselinux1-dev [linux-any], - libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], + libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libmagick++-6.q16-dev, libacl1-dev, liboss4-salsa-dev [hurd-i386 kfreebsd-i386 kfreebsd-amd64], diff --git a/debian/control.in b/debian/control.in index 31f8d1a15e4..cbba36fd6fe 100644 --- a/debian/control.in +++ b/debian/control.in @@ -14,7 +14,7 @@ Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, lib autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42), debhelper (>= 9), libxaw7-dev, sharutils, imagemagick, libgtk-3-dev, libgnutls28-dev, libxml2-dev, libselinux1-dev [linux-any], - libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], + libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libmagick++-6.q16-dev, libacl1-dev, liboss4-salsa-dev [hurd-i386 kfreebsd-i386 kfreebsd-amd64], diff --git a/debian/rules b/debian/rules index fb4418971bc..94d0632f9f8 100755 --- a/debian/rules +++ b/debian/rules @@ -300,6 +300,7 @@ confflags += --mandir=/usr/share/man confflags += --with-pop=yes confflags += --enable-locallisppath=$(local_lpath) confflags += --with-sound=alsa +confflags += --without-gconf # x configure flags confflags_x := $(confflags) @@ -313,7 +314,6 @@ confflags_x += --with-toolkit-scroll-bars # nox configure flags confflags_nox := $(confflags) confflags_nox += --with-x=no -confflags_nox += --without-gconf confflags_nox += --without-gsettings # lucid configure flags @@ -321,7 +321,6 @@ confflags_lucid := $(confflags) confflags_lucid += --with-x=yes confflags_lucid += --with-x-toolkit=lucid confflags_lucid += --with-toolkit-scroll-bars -confflags_lucid += --without-gconf confflags_lucid += --without-gsettings define cfg_tree -- 2.30.2